Boring merge from savannah.
authorAlan Mackenzie <acm@muc.de>
Fri, 28 Oct 2011 14:35:39 +0000 (14:35 +0000)
committerAlan Mackenzie <acm@muc.de>
Fri, 28 Oct 2011 14:35:39 +0000 (14:35 +0000)
commit20d213b3934321d4fe5e45f9a85baf3af887a36f
tree4862d6326a51e6e291932a5987178193e36f26f2
parent595d8d8b1cdfafe7adce6275e7b20376064558ff
parentef8d31c6c14a096f31463b513cd9e528cc03db59
Boring merge from savannah.
doc/misc/cc-mode.texi
lisp/progmodes/cc-engine.el
lisp/progmodes/cc-vars.el